Fixes in 2 dependency files to use functionality with vires data models.
Cleanup, range type sorting, better structure.