Fixing imports after VBD model updates