Changes to OLD model, CF model and controller to fit new DB