Add support for Unset (not really) and add constants to shim