Updated for v0.78.