Upgraded the syntax for range indexes to the latest one