top: improve use an single instance client