@monokrome : We will take in the pull request. But if @sgrif comes up with a way to avoid the attributes or a different approach, this may change.