More parameters (hopefully) supported