Removed oneof usage.