* Marshalling code update