Applied changes for v0.10.0