More changes to the dictionary and the database schema. Still not finished = code broken.