Adding more customization for query process