Add timeout & timeout handler
Try to bypass i18n for now