Feature/moreterms2model

Review after terms2update is merged