Removed LITERAL type. Added type predicates. Updated driver to support new lines until the final )