Modify the way to get data