Use service ids instead of class

Reference #12