Update guard and guard-spec