Improving dependency registration (work in progress)