Added more types of ranges