Refactoring of BayesianModels 3 (minor)