Add algo factory and fix null property manager access