New models in the package sources, refined some partial models to reduce code duplication