Replaced EntityWrapper with Entities and Transactions

Implements EUCA-8101