Added guard and spork support