align db_structure.sql