Updated documentation and make filters passable from outside