Added timestamp generation