Improved handling of heuristics for sos1
Large refactoring a new strategies