Modified dependency paths to be more general