changes for SM Toolchain