Support Tundra namespace