Allow for deferred modules.
Working on v2.