Update data path properly