User-defined filters

Change-Id: I68b53692f1714ad1b90c316eb39a8e368db71770