Extracted the entity handler context from the entity handler context
Made the data access not a descendant of EntityContext