Block storage - replaced EntityWrapper code with Transactions