Advanced the implementation of the Champion detail. Refactoring.