Added timestamp option