Enhance range handling