Adding few more cases