Added framework for query execution