Add timestamp checking