Updated dao/controller