Made some changes to dependency management