Addition of service and other classes