Updated archon, used wrapped metrics