Use correct data path.
Improve performance.