Adding dependency tracking