Add some dependency handling