Added support for no-timeout