Add guard and spork functionality