Removed context argument from Controller class.
Fixes broken overrides.