Added multivariate support