Add generic introspection
Change List to Map with UniqKey in ResourceEntry