Adds DAOs and Factory patterns support