Add instantiation state check