Generalise importers - generalise a bit more