Changed namespace to map with assemblyName