More work on persistent connections