Added base64 support