Added code for v0.0.3.1