Update timeout methods (#91)