Add Spork support