Added filter support and some nice integration tests