Added timestamp implementation