Add ability to get collection name & reformat everything