Move timestamp into its own concern