Refactoring + additional SQL functions

Merge request reports

Loading