Added support for changing output variable name