Implement more corner cases