Fix other places that were using old traits.
Adding a BaseController using new trait.
[ci skip]