Added timestamp formating option