Parameterize iterables
Clean up attribute storage
Merge remote-tracking branch 'origin/master' into attribute-storage
Formatting