Adding music handling