Update changes for 0.11.1