Refactored model specs with new syntax and better grouping
Addded round sorter utility