Added support for QueryProcedure next to QueryStatement