Added generated queries