Update to use cucumber