Changed type for some fields
Removed extra fields from header