Refactoring hydration.
Fixing duplicate persister bug.
Optimizing imports.