Changed make.formula to allow random components