Add new fields to identify metrics source