NTD and cmakelists update