Updated class now for all entity messages