Added shell support