Added missing fields in messages