Improvements to commands