Adding domain Objects
refactoring
bugfixing