Added person colocation with org id.
Fixed equals and hashCode
Improvements.