Change List to Map with UniqKey in ResourceEntry