Added utils written for oneof use