Adding more cases