Changes for support shell scripts