Camels and Cats without Generated Structures

With the newest snapshot, beta, and preview, camels spawn in desert villages. While I trust there is a reason that they were set to spawn here instead of throughout the desert, this is an issue for some players that choose to play with Generated Structures disabled, who will never be able to play with this feature. While I understand that this might make sense for some mobs, it feels strange for an animal existing in the real world (in fact, one that is added for that reason of allowing players to see parts of their world in game) to be inaccessible without villages. This is also true for cats, which required villages or swamp huts to obtain after Village & Pillage, thus preventing players from having pet cats without structures (not very Fauna Faire). I have an idea for each of these mobs which will retain what has already been added but allow players who do not have villages in their world to access these animals:

• Camels: Finding camels in villages can be preserved, but a less common spawn in the desert would fit and solve this issue. This will mean that desert villages still are the best place to look, but not the only location.
• Cats: While I would not be opposed to some biomes having a rare spawn for cats, I think there is a better option that is also faithful to Minecraft's history. Remember when Ocelots and cats were the same mob? When breeding Ocelots, there could be some chance that the baby is one of the cat variants (with higher chance for all black on full moons).