Work on dispatcher mode in parser