Added addSong and removeSong