Optimized imports pt2