Adapts some changes to the new dependency package