Refactored libraryDependencies