Add support for optional fields