Improvements to command management