[IMPROVED] Consolidated imports.