Utilize new factories when configuring attributes.
Merge branch 'tng' into rework-sorting