Instance refactoring