Added the ability to set more parameters for 2.4.x