Changed order of service definition