Changed the way namespaces are loaded