Fix typo
Refactor to store sub-objects outside of attributes
Implement support for lists