Re-use modelBuilder - correctly fixes lookup