Updates for variable mapping, now points to temp variable and set to resolve afterwards as workaround