Added shell interaction support