Added timeout for client