Optimized imports. Working on duct compat.