Would it be possible to have all units gifted by Militaristic city states to automatically spawn in whichever city has your Heroic Epic? This would help reduce micro managing and feel bad moments when units spawn in a puppet city. It would also make Heroic Epic a much more attractive national wonder to prioritize