- Changed data references to Collection instead of List for more generic
usability