Improve command