Additional models and bugfixes