[Refactor] Make the used dependence types explicit