Better Dependency Handling