Ashwin/Melanie | Optimizing imports