Single parser functionality moved to modes parser - first step to the
unification of parsers