Renamed any attribute args to query