Improved offline usage.