Better modularity for player.