Another attempt and removing import errors during 2.0.0 to 3.0.0 upgrade