Marking some elements as nillable and adding support for source / result