Added public and private messages support again, after refactor to actor pattern