Make complete library import work again