AppFile related changes to controller and model