Use variable like in classic version