Tweak to generate as well as accept the new Base64 IDs