Refactored ContainerAware interface and BaseController