Add support for predicate questions
Fix bugs and update specs