Changes on interpetor class