Fixed model order and field names