Added rangelen support