Added tenative types to fields