Refactored the EntityHelper to allow injection of readonly properties