More work on import API