Updated changes for v0.03