Domain and Dao changes
Merge branch 'master' of https://github.com/anetfreak/project-vars