Updtaed models and controllers