[Core] Fix imports and type references
[Core] DERP