Add keep-alive support