Add Guard & Spork support