Added variable resolution.