Added some new modules.
Fixed filter function.