Added support for additional swithces and parameters