Added Marshal and Unmarshal Handling Classes