Updated data path