Add Service and Connection class