Added Subshell support