Added timestamp support