Added additional fields to query