Added headers base64 handling