Better decoupling for package manager