more constraints

- added not null to fields
- removed unknown model type (use model_name instead)