Add default shell support