Update for v0.5.4