Added full shell support