NData source changes (BPS-185)