command infrastructure improved