Adding some more cases