Added special "keep-alive" handler