Fixed GenData support for multiple arguments