Migration to new dependency system