Added marshaling route
Resolved merge conflicts