Domain models refactoring
DAO layer refactoring
MOAR REFACTORING