Changes:
- Validate fields and key
- Modify Field Dialog