Added support for long and int parameter types