[Evgeny, Jason] changed Command implementation to not use context