DheerajAgarwal final deprecated code for v0.6