Added generalized DoE functionality