Adapting component loading to new dynamic loading macros