Dep version upgrade
Refactorings for 2.0.0
Refatorings