Added shield (#78) + upgrade enhancements