Added some services to bootsrap and some little modifications to Service class