Update to use new form of referencing immutable model object lists