Update and fix the variable scheme

Related to #1 (closed).

Merge request reports

Loading