Updated the way dependencies are parsed