Adds support for optional fields.