Organization database/object model changes, after comments from Tor.