Updated changes for v0.3.37