change to use ContainerAwareCommand instead of Command