Model update

See PR 476 (closed), created a new branch on upstream the PR