Add Guard/Spork support