Add nconf
Revert jump rework