Remove base64 requirement