Add flag to enable/disable checking
Add option to skip splitting and sorting