Make keep-alive configurable