Added timestamp support.