Improve base loader.