Update to latest pksunkara/attributes
Attributes wrap WIP