Add null models, simplify options processing to use only theta