Moved timeout methods to a new class