Add better data to query