Added structure for query