Improved imports in utils