Re-implement support for rare songs