Added modular filters

Replaces: #31