Make NodeDefinition loading more dynamic