Re-export two datatypes #26