add experimental shim support