Refactoring of the timestamp use