Refactored the DoctrineStorage class
Created some hydrator classes