issue24 and issue 25 proposal for new models

Beside #24 also the changes for #25 are implemented in this pull request as they overlap