Enhance to support range