Change to use DM lib from rd_data_stable