#40 Compile errors after service class introduction
Merge branch '40-compile-errors-after-service-class-introduction'