Further improve lazy-load mechanism
Fix namespaces