Added custom filter support