Adds guard support
Adds spork support