Add tuple support for parameter resolution
Fix reference issue while parameters are resolved