[SLC] Support criteria
Merge pull request #965 from FabioBatSilva/slc-criteria

[SLC] Add support for criteria