Update
New communication classes updated