Add support for keep-alive timer