Faster imports as port #198