1. refactor
2. changes to entity.xsd and field.xsd