Migrated to new dependency system