Added shield autodetection