Further improvements to contextualization for deser side