Refine some plugins to be loaded lazily, continued...