Added FilterStore and a unit test