added kadira support and timeout