Switched to Command infrastructure