Add basic filtering capability