Service/service layer changes #52

Closed cedrik-baedorf closed 9 months ago