Updated Marshaling for pieces