added all message properties to ES version to avoid potential exception