MOD move some fields to parser
ADD geps