1.3.2: Improve Range implementation