Expression parser improved