Improve data fetch compatibility