Added special handling for timestamp