Added player and playback handling