Refactor EntityHydrator