More work on migrating to new dynamic loading structure