WIP: Fix import/export for split