Added support for more restricting subranges