Adding marshalling for query-results