ORM update

Collection
Simplified structure

TODO list created