Updated marshalling list