Aden 1402 refactor performance tracking