Separated the location into Collection and Name
Seems like a lot of work for little gain