Update imports and fix instance preview