Updated uses of Song instances