Added support for "timeout-message"