Changes to DAO & MVC