Added dependencies
Changed dependency handling