Made the accept predicates a bit more regular