Optimnize imports