Refactor Range objects to use generic base