- Added missing fields
- Minor changes