Tmp changes for audio support