Prepare integration of new service types 254