Adding NamespaceMap and modified JLoader