Reworking on how dependencies are gathered and used.