Sockeye: Fix import system