Added param mechanism to control behavior