Adding better Entities and Collections
Changing the way forms are built (prevent circular references)
Changed the way forms are built
Changed (again) the way forms are built