Added messaging to entities