Added Guard & Spork functionality