Added support for instance name