Added basic filter builder implementation