Rework of interpreter