Added some better dependency handling