Added proper dependency tracking