Extend `Command` instead of `ContainerAwareCommand`