added shell support