External code lists improvements - Work in progress
External code list improvements - work in progress