removing back the KeepAliveService which will be included on 0.9.0