Fixing collection to use new private modelData