Rework Shield to make it more modular