Adding changes for 2.0.1