Add cucumber and guard cucumber support