Refactored IOOS XML subtypes for better reuse