Added track and album fields