Add inital code for structured queries