Added shell mode support

Added shell mode support.