Ported old functionality to new combined maximum likelihood fit