Added changes for 0.10.0