Added headings for returned data
Added support for individual songs