improve timestamp support