Update Processor to work on Max's query format