Additional changes to v0.3