Changes to use app mvc