Implement proper dependency resolution for different environments