Add some new attributes and components, struggling to figure out how to deal with list objects now.