Added TypeFilter