Optimize importing