Add spork support