[Core] Hopefully fix module imports