Remove service entry class
Improve accessing services