Added new parser definition.
Changed current Filter class to use the new filter structure

Updated the test cases to match the new syntax.