Move to actor model, add flags