modifying schema to remove inconsistencies with domain model