Issue #6: Collection and Items entities revised