Adding the changes for js-ncr