Adding in collection.* token attributes