Updated for v0.5.5