Add proper dependency management