Add'l changes to include update and delete metrics operations