Adding support for shell evaluation