Improving predicates, closes #213