Now supports instance change