aadded support for nullable fields and Option types