Multi instance

Additional mutli-instance support.