Adding more model and DAO