Bugfix and new features, separation of concerns between expected manager and their model configuration