Added proper default handling for timestamp.

Not added test cases though.