Fixed: move every function in Cucumber.j