Improve sound management