Added support for b64ref