Added SetController method
Minor updates