Added Guard & Spork Support