Add Spork and Guard