Additional changes for 0.2.2