CLI imports optimized