Update services to comply with the specification