Improved commands for better usability