EUCA-8110: replace EntityWrapper with Entities