Add proto3 option to handle singular fields