Adding base64 support