Added dynamic param creation for lookup values