DBC! A bunch of changes to the schema to clean it up