MusicHandler class improved and updated