Added dynamic imports (to avoid circular references at import time).