Move DEFAULT_TIMEOUT into the data store
Move DEFAULT_THRESHOLD into the data store