Add NamingDirectory and NamingDirectoryInterface