moved parser switch in helper class