Sockeye: Improve import handling