Extended the index to handle artists as well