Merge branch 'databaseConstruction'