Update from v0.5.3