dependency tracking improvements