Changes to SetModel & Controllers