Optimized imports on dev branch