Refactored code to start using the base proto classes for the internal message field types.