Improved command implementations