Took out thing model, added new schema.