Now using nodeId instead of URI in database tables