Added support for individualizing endpoint instances