configurable timeout parameter added