Refactoring to make running more services easier, added some services