More work on import handler