better handling of missing struct fields: should handle all types now