Extended command management a lot more