Commands improvement