refactor Attributes to more fit the package description in the RFC