Added extra_kernel_params option