Add guard and spork and helper