Added check for timestamps