Implementing a non static service and some other changes