Rework of TimeoutMap #22 #26