Decouple whitelisting filter into two classes