Optimising imports