Added more parameter sets