add dburianov changes and nconf