Make it consistent to use modelBuilder