Fixed project config
Small fixes to DAO