Added Guard and Spork support