Better support for sound & music