Updates to shim