Updated StructType as discussed today