Moved messages to separate package