Added equivalentTo.
Lots of changes.
More changes on ORM.