Moved timeout property to shared state