Added Guard and Cucumber