added unified instance support