Make factor and modifier optional