Improve check command