Moved messages and actors to model