Refactor controllers with new DAO