Added better support for playback/record states