New code to support dynamically loaded modules