Add Range support
Add Range support