Added variable resolution for static system variables