Collection: made work with new yaml data structure