Begining of consolidation with trunk/stanford variatants of the database.