Changed ContainerAware to ApplicationAware