Expression parser improvement