More work on import