Changes to cucumber mode