The new database schema and dictionary - tested and debugged