Changes to allow for instance naming and instance linking.