Update attribute structure to reflect best practices