[TASK] Complete MarshalService