Maybe `addModel` should default to `true`?