Removed never used dependency
Implemented a container class and a hydrator