New Hubs for enum removal