Add support for shell