Added yield, affect, match queries.