Added disconnect and demolish methods