Added song and album types