Timeout and persistent connection feature added