Added KeepAlive and more spec cleanup