Instance wrapper added, terminate support added