HHH-8118 Updated CL use in entitymanager and services