Changed controller base class to ContainerAware.