Use proper data path