Add backwards compat with base64 encoded attrs