Refactored Champion class