Added Set shim