added navigator and queue handling in parser