Add validation function for race instead of doing it ad-hoc, remove validation function for id's.
Add validation function for race instead of doing it ad-hoc, remove validation function for id's.

ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery,ShieldBattery/ShieldBattery