Only one MarshalHandler class, improved date handling - not yet really good