Fix Entries should extend EntityCollection