Add processing of optional parts (do not populate).