Solidify enhanced dependencies parsing

[matgrioni]

Enhanced dependencies parsing is not entirely clear to me. It seems like there is a file which specifies enhanced relationships but I have not properly taken this into account.