Changes for the nttdata demo