Consolidated the three data classes for easier extension creation.