Add support for qualify clause #555