- Fixed password in toJSON instance
- Slight type changes
- FromJSON instance for 'FieldType'