Move scores into the context object