Preparing to support more complicated questions