first changes for the new service management