Update to use base64 wrapper on url