Readded the separation between explicit long and timestamp