Adding support for keep-alive