Initial work on dependency handling