Switch to using one serializable class for messaging