Changes to add background audio support