Include new and old shields

Prepare for upcoming mods