Improve the range component