Added subshell support