Added Spork and Guard support