Added Predicates
Remove Regex code