Need to adapt the factory classname parameter too.