Improved shell support