Added spork and guard support