Put the last touches on command management