I was thinking about doing that actually, but wanted to submit it as a separate issue for tracking purposes. Once this PR is closed I'll go ahead and create a JIRA issue for that and go through all calls where the extra_attributes_map exists if you're okay with that approach.