Adding enhanced current player support.