Generalise importers - tidy up class interface