Refactored oneofs into their own container class.