Change behavior for selecting covariance type