Added timestamp check