Localize and improve Commands