Improve command call