Smarter import adding