Improvements on commands