Added dependency handling!