Better support for models and types.