Refactor the contructor of the main Naomi class. Simplycity.
Renamed "collection" class to "entity-set", seems more descriptive and refers to an ER diagram.