Add support timeout handlers.
Minor tweaks