Updating service provider to use new NamespaceElementFactory to instantiate new element objects