Added new Service infrastructure