Added support for Record timeout