added changes for v0.5.3