Adapt timestamp management in instant