Faster imports as per #198