Refactoring method hydrateEntity -> extractEntity