Improve stat checking command