Refactor parsing
Add filter creation methods