Extend ContainerAwareCommand instead of Command