Add DAO and DAOProxy