Updated Range class