Some additional changes for v0.053