change model structure and validation system