Use service ids instead of class

Reference #12
Add some test cases
Merge pull request #18 from benja-M-1/feature/use-services

Use service ids instead of class