add full base64 support