Accept Time
Proper OR
Marshalling fixes