Change angle_range to use Range