Improved imports in some plugins