Added controller getter and comments