Node import and abstract fix