Updated code to use services in correct approach

Merge request reports

Loading