Consolidate into a buildAttributes() emthod

Merge request reports

Loading