Refactoring of competition to allow career and MP