Added support for dataset filtering.