Enhance resource lookup
Enhance editable list