master: Updated Controller to remove "model" reference