Add cucumber support