Add support for custom base controller