Improved handling of biome variants