Add support for Spork and Guard