Fix imports in model framework