Added ability to disable keepalives