Changes for v0.009