Added support for embedding the shell