Add suport for WITH/SELECT