Object marshaller refactoring