Changes to support multiple actors