Updated Class/Controller Overrides