Updated dependency handling.