Reworking dependency management during resolving phase