Fix: updated import/export functions