v0.9.0 improvements