Updated for latest spooker release