Amend to shim functionality