Added DAO and models