Added more use cases, removed duplicates