Added some more WWN fields.
Added TODO