Cases

* Added more cases.