Better dependency tracking