Both those ideas sounds good, but I'd handle them as separate pull requests. Do the `model` and `model_pluralized` context changes and your add form changes as this pull request, and do the template refactoring as another (assuming @pydanny merges this one in).