add spork and guard support