Changing board and metric to have key and context