Update to meet BDO standards regarding metrics