add base64 support
TODO update