Adding more cases to where specification