Updates for v0.15