Classes DAO
Merge origin/master