Some more changes/files to support multiple instances.