Added support for individualizing endpoint instances

@johnsimons @SimonCropp review please