Progress on shell support