Reworked timestamp handling when saving content