Adds Object Filter Support. Adds tests.